Merge version 5.15.17+dfsg-6+rpi1 and 5.15.17+dfsg-7 to produce 5.15.17+dfsg-7+rpi1

diff --cc debian/changelog
index 9084eef2a5ec45885bdbf938c14f65f7597c3e89,b95e23a84af898b125ab8bea01729a70cecf85b0..31b5f966a6258a5d23bbb125fd1902124d7ef25e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,9 +1,22 @@@
- qtbase-opensource-src (5.15.17+dfsg-6+rpi1) forky-staging; urgency=medium
++qtbase-opensource-src (5.15.17+dfsg-7+rpi1) forky-staging; urgency=medium
 +
 +  [changes introduced in 5.6.1+dfsg-2+rpi1] by Peter Michael Green]
 +  * Partially fix clean target.
 +
 +  [changes introduced in 5.9.1+dfsg-9+rpi1 by Peter Michael Green]
 +  * Disable neon (-no-neon no longer seems to work, so edit configure.json instead)
 +
 +  [changes introduced in 5.15.13+dfsg-2+rpi1 by Peter Michael Green]
 +  * Add build-conflicts on libts-dev to avoid unwanted extra files.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 21 Jan 2026 07:20:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 08 Feb 2026 19:29:51 +0000
++
+ qtbase-opensource-src (5.15.17+dfsg-7) unstable; urgency=medium
+ 
+   * Backport upstream patch to revert locking simplification, which caused
+     data race (closes: #1126100).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Thu, 29 Jan 2026 22:25:23 +0300
  
  qtbase-opensource-src (5.15.17+dfsg-6) unstable; urgency=medium
  

diff --cc debian/patches/series
Simple merge